displaymanager: Move set_default_display vfunc

... to GdkDisplayClass.make_default. It's only implemented by X11
anyway.

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 44dc9d4c9192d8640621feae10b834bcb9047a34..32d9d3a72ebdebf42b9c564527e56432f8012c8a 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -81,6 +81,11 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT)
 
+static void
+gdk_display_real_make_default (GdkDisplay *display)
+{
+}
+
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
@@ -92,6 +97,8 @@ gdk_display_class_init (GdkDisplayClass *class)
   class->get_app_launch_context = gdk_display_real_get_app_launch_context;
   class->window_type = GDK_TYPE_WINDOW;
 
+  class->make_default = gdk_display_real_make_default;
+
   /**
    * GdkDisplay::opened:
    * @display: the object on which the signal is emitted

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 75159650863bd3f1a15d6cfacbbd1c55ca758fb2..de045828e716148307c26d57b8a03fdbe91fb055 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -26,6 +26,7 @@
 
 #include "gdkconfig.h"
 #include "gdkdisplaymanagerprivate.h"
+#include "gdkdisplayprivate.h"
 #include "gdkinternals.h"
 #include "gdkkeysprivate.h"
 #include "gdkmarshalers.h"
@@ -480,8 +481,8 @@ gdk_display_manager_set_default_display (GdkDisplayManager *manager,
 {
   manager->default_display = display;
 
-  if (GDK_DISPLAY_MANAGER_GET_CLASS (manager)->set_default_display)
-    GDK_DISPLAY_MANAGER_GET_CLASS (manager)->set_default_display (manager, display);
+  if (display)
+    GDK_DISPLAY_GET_CLASS (display)->make_default (display);
 
   g_object_notify (G_OBJECT (manager), "default-display");
 }

diff --git a/gdk/gdkdisplaymanagerprivate.h b/gdk/gdkdisplaymanagerprivate.h
index 547ea71eca7c706d850e1b0848336cdd2d933504..6123f816a895c14f9882e855ff096b968d9405ce 100644 (file)
--- a/gdk/gdkdisplaymanagerprivate.h
+++ b/gdk/gdkdisplaymanagerprivate.h
@@ -40,8 +40,6 @@ struct _GdkDisplayManagerClass
   GObjectClass parent_class;
 
   GSList *     (*list_displays)       (GdkDisplayManager *manager);
-  void         (*set_default_display) (GdkDisplayManager *manager,
-                                       GdkDisplay        *display);
   GdkDisplay * (*open_display)        (GdkDisplayManager *manager,
                                        const gchar       *name);
 

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index d8e27849ea80b9ace37893593580415584fbbacf..69fffb1683f8705eb071ff509575e0c2db8c3c94 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -142,6 +142,7 @@ struct _GdkDisplayClass
   void                       (*flush)              (GdkDisplay *display);
   gboolean                   (*has_pending)        (GdkDisplay *display);
   void                       (*queue_events)       (GdkDisplay *display);
+  void                       (*make_default)       (GdkDisplay *display);
   GdkWindow *                (*get_default_group)  (GdkDisplay *display);
   gboolean                   (*supports_selection_notification) (GdkDisplay *display);
   gboolean                   (*request_selection_notification)  (GdkDisplay *display,

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 83b8dc18169742dc778a3976a1159b49d654b427..ee42ea9c8d112fc541cdb2d136afceca740cfbd9 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -424,11 +424,6 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
   return ++serial;
 }
 
-void
-_gdk_wayland_display_make_default (GdkDisplay *display)
-{
-}
-
 /**
  * gdk_wayland_display_broadcast_startup_message:
  * @display: a #GdkDisplay

diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c
index ac43caabeef9cfc67a8dc2e16f3cc731a5600bca..43a99605823fc7e756d39c6b8f26ce5914132849 100644 (file)
--- a/gdk/wayland/gdkdisplaymanager-wayland.c
+++ b/gdk/wayland/gdkdisplaymanager-wayland.c
@@ -106,13 +106,6 @@ gdk_wayland_display_manager_list_displays (GdkDisplayManager *manager)
   return g_slist_copy (GDK_WAYLAND_DISPLAY_MANAGER (manager)->displays);
 }
 
-static void
-gdk_wayland_display_manager_set_default_display (GdkDisplayManager *manager,
-                                                GdkDisplay        *display)
-{
-  _gdk_wayland_display_make_default (display);
-}
-
 static GdkAtom
 gdk_wayland_display_manager_atom_intern (GdkDisplayManager *manager_in,
                                         const gchar       *atom_name,
@@ -205,7 +198,6 @@ gdk_wayland_display_manager_class_init (GdkWaylandDisplayManagerClass *class)
 
   manager_class->open_display = gdk_wayland_display_manager_open_display;
   manager_class->list_displays = gdk_wayland_display_manager_list_displays;
-  manager_class->set_default_display = gdk_wayland_display_manager_set_default_display;
   manager_class->atom_intern = gdk_wayland_display_manager_atom_intern;
   manager_class->get_atom_name = gdk_wayland_display_manager_get_atom_name;
   manager_class->lookup_keyval = gdk_wayland_display_manager_lookup_keyval;

diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index a39893dffc56c41371fd57c6558f7049dddd42aa..02d5b6dcaf5b16a3a743af0f65ab64b3709570bf 100644 (file)
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -156,7 +156,6 @@ void     _gdk_wayland_display_queue_events (GdkDisplay *display);
 GdkAppLaunchContext *_gdk_wayland_display_get_app_launch_context (GdkDisplay *display);
 
 GdkDisplay *_gdk_wayland_display_open (const gchar *display_name);
-void        _gdk_wayland_display_make_default (GdkDisplay *display);
 
 GdkWindow *_gdk_wayland_screen_create_root_window (GdkScreen *screen,
                                                   int width,

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 224ad17a2db4692071b3652c8531cd87236a9e35..fc4c9793004750b0aa8bb6d721c0d24b9ddf4b07 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1997,8 +1997,8 @@ gdk_x11_display_get_xdisplay (GdkDisplay *display)
   return GDK_X11_DISPLAY (display)->xdisplay;
 }
 
-void
-_gdk_x11_display_make_default (GdkDisplay *display)
+static void
+gdk_x11_display_make_default (GdkDisplay *display)
 {
   GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
   const gchar *startup_id;
@@ -2791,6 +2791,7 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->beep = gdk_x11_display_beep;
   display_class->sync = gdk_x11_display_sync;
   display_class->flush = gdk_x11_display_flush;
+  display_class->make_default = gdk_x11_display_make_default;
   display_class->has_pending = gdk_x11_display_has_pending;
   display_class->queue_events = _gdk_x11_display_queue_events;
   display_class->get_default_group = gdk_x11_display_get_default_group;

diff --git a/gdk/x11/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c
index d591358dde4657bd0e15bb76f705fb8f66e04756..61c04dfcea5ee2a9af6a55a306ee55bd9dbf41a4 100644 (file)
--- a/gdk/x11/gdkdisplaymanager-x11.c
+++ b/gdk/x11/gdkdisplaymanager-x11.c
@@ -98,14 +98,6 @@ gdk_x11_display_manager_list_displays (GdkDisplayManager *manager)
   return g_slist_copy (GDK_X11_DISPLAY_MANAGER (manager)->displays);
 }
 
-static void
-gdk_x11_display_manager_set_default_display (GdkDisplayManager *manager,
-                                             GdkDisplay        *display)
-{
-  if (display)
-    _gdk_x11_display_make_default (display);
-}
-
 static void
 gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 {
@@ -130,7 +122,6 @@ gdk_x11_display_manager_class_init (GdkX11DisplayManagerClass *class)
 
   manager_class->open_display = gdk_x11_display_manager_open_display;
   manager_class->list_displays = gdk_x11_display_manager_list_displays;
-  manager_class->set_default_display = gdk_x11_display_manager_set_default_display;
   manager_class->atom_intern = _gdk_x11_display_manager_atom_intern;
   manager_class->get_atom_name = _gdk_x11_display_manager_get_atom_name;
   manager_class->lookup_keyval = _gdk_x11_display_manager_lookup_keyval;

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 2bdda3d5160d3c00d03c50f2a99f4dbfd43ede2e..6f7754a997b347794d7a3f8b6d66d90e8975a197 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -168,7 +168,6 @@ gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
                                           Window      xroot_window);
 
 GdkDisplay * _gdk_x11_display_open            (const gchar *display_name);
-void _gdk_x11_display_make_default            (GdkDisplay *display);
 void _gdk_x11_display_update_grab_info        (GdkDisplay *display,
                                                GdkDevice  *device,
                                                gint        status);